Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Exclude test directory while generating package - #13425

Merged
Hainish merged 1 commit into
EFForg:masterfrom
gloomy-ghost:make_script
Sep 4, 2018
Merged

Hainish merged 1 commit into
EFForg:masterfrom
gloomy-ghost:make_script

Conversation

@gloomy-ghost

Copy link
Copy Markdown
Collaborator

The 2017.10.30 release includes a test directory which is not used within the extension

@gloomy-ghost gloomy-ghost added this to the Before the Next Release milestone Nov 9, 2017
@jeremyn

jeremyn commented Nov 19, 2017

Copy link
Copy Markdown
Contributor

This looks okay to me.

@Hainish Can you please double-check this and merge it? It saves about 2-3KB off the final extension size.

@Hainish

Hainish commented Dec 4, 2017

Copy link
Copy Markdown
Member

Good catch @gloomy-ghost. We already exclude files via do_not_ship:

https-everywhere/make.sh

Lines 56 to 57 in 5db3993

do_not_ship="*.py *.xml"
rm -f $do_not_ship

These are files that can't be in --exclude due to the wildcard, even though test can be. For the sake of consistency, though, we should add test to this env var and change the rm -f to a rm -rf on the line under it.

@Hainish

Hainish commented Dec 4, 2017

Copy link
Copy Markdown
Member

Instead of rsync then rm, this rsync option should prove useful:

       --exclude-from=FILE
              This option is related to the --exclude option, but it specifies a FILE that contains exclude patterns (one per line).  Blank lines in the file and lines starting with ’;’ or ’#’ are ignored.
              If FILE is -, the list will be read from standard input.

@jeremyn

jeremyn commented Dec 4, 2017

Copy link
Copy Markdown
Contributor

I don't know about --exclude-from=FILE. I don't want to have an extra config file hanging around, and I guess the standard input option would require some xargs piping.

@Hainish

Hainish commented Dec 4, 2017

Copy link
Copy Markdown
Member

Seems like there may be some overlap here: we already have the https://github.com/EFForg/https-everywhere/blob/master/.build_exclusions file. Perhaps we should just move the do_not_ship files into this, instead of having two separate places which serve the same purpose.

@cschanaj

Copy link
Copy Markdown
Collaborator

What is the status of this PR? it has been a while since this is on the "Before the Next Release" milestone.

Related #16122

@Hainish
Hainish merged commit 07dad11 into EFForg:master Sep 4, 2018
@Hainish

Hainish commented Sep 4, 2018

Copy link
Copy Markdown
Member

Thanks @gloomy-ghost!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants